Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

scripts: Always run ld_config before running any update scripts #1335

Merged
merged 1 commit into from
Feb 28, 2020

Conversation

otaviobp
Copy link
Contributor

It's possible to create a post_update script to run ld_config, but we
had problems with this in the past, so it was decided to hardcode that
on swupd instead of relying on scripts.

Signed-off-by: Otavio Pontes [email protected]

@bryteise
Copy link
Member

I'm curious if there will be improvements to clearlinux/distribution#1765 with this change.

Copy link
Contributor

@castulo castulo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

very small changes required

src/scripts.c Outdated Show resolved Hide resolved
src/scripts.c Outdated
@@ -94,6 +94,21 @@ static void exec_post_update_script(bool reexec, bool block)
free(params[0]);
}

static void run_ld_config()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you forgot the 'void' argument here, I learnt that from you 😝

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you forgot this ☝️

It's possible to create a post_update script to run ld_config, but we
had problems with this in the past, so it was decided to hardcode that
on swupd instead of relying on scripts.

Signed-off-by: Otavio Pontes <[email protected]>
@otaviobp
Copy link
Contributor Author

V2: Fixed the minor problems

src/scripts.c Outdated
@@ -94,6 +94,21 @@ static void exec_post_update_script(bool reexec, bool block)
free(params[0]);
}

static void run_ld_config()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you forgot this ☝️

@otaviobp
Copy link
Contributor Author

Sorry, I didn't add that to the commit

Copy link
Contributor

@castulo castulo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@otaviobp otaviobp merged commit db8e559 into clearlinux:master Feb 28, 2020
@mythi
Copy link

mythi commented Mar 2, 2020

I'm curious if there will be improvements to clearlinux/distribution#1765 with this change.

I tried adding RUN ldconfig next to swupd commands in my Dockerfile and the image still fails.

@otaviobp otaviobp deleted the update branch April 3, 2020 19:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants